Skip to content

OCPNODE-4521: Use programmatic skip for single-node instead of test name tag - #31486

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
saschagrunert:fix-additional-storage-shard
Aug 11, 2026
Merged

OCPNODE-4521: Use programmatic skip for single-node instead of test name tag#31486
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
saschagrunert:fix-additional-storage-shard

Conversation

@saschagrunert

@saschagrunert saschagrunert commented Aug 5, 2026

Copy link
Copy Markdown
Member

Remove [Skipped:SingleReplicaTopology] from the Describe string and use a programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for deterministic sharding (pkg/test/ginkgo/sharder.go), which moved the test from shard 2of2 to 1of2 and reset all Sippy run counts to zero. This blocks the feature gate promotion in openshift/api#2858.

This reverts the test name to its original form (from #31439) while preserving the single-node skip behavior.

Summary by CodeRabbit

  • Tests
    • Updated storage end-to-end tests to explicitly skip on single-node clusters.
    • Added a clear message explaining when the required topology is unavailable.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 5, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 5, 2026

Copy link
Copy Markdown

@saschagrunert: This pull request references OCPNODE-4521 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Remove [Skipped:SingleReplicaTopology] from the Describe string and use a
programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for deterministic
sharding (pkg/test/ginkgo/sharder.go), which moved the test from shard 2of2
to 1of2 and reset all Sippy run counts to zero. This blocks the feature gate
promotion in openshift/api#2858.

This reverts the test name to its original form (from #31439)
while preserving the single-node skip behavior.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@saschagrunert

Copy link
Copy Markdown
Member Author

@haircommander @mrunalp @rphillips @cpmeadors could one of you approve this? It unblocks the AdditionalStorageConfig feature gate promotion (openshift/api#2858).

@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 8daacc2d-e578-4d03-9d56-f981c8b89326

📥 Commits

Reviewing files that changed from the base of the PR and between bec58d2 and a7a02f0.

📒 Files selected for processing (1)
  • test/extended/node/additional_storage_e2e.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • test/extended/node/additional_storage_e2e.go

Walkthrough

The test replaces the Skipped:SingleReplicaTopology suite label with a BeforeEach check. It detects single-node clusters, verifies detection, and skips with an explicit message.

Changes

Single-node test handling

Layer / File(s) Summary
Runtime cluster check
test/extended/node/additional_storage_e2e.go
The test detects single-node clusters before execution, verifies detection, and skips when MCP rollouts are unreliable.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: rphillips, anahas-redhat

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Test Structure And Quality ❓ Inconclusive Investigation is still in progress; no final assessment submitted yet. Continue reviewing the changed Ginkgo test and its helper contracts.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: replacing the single-node test-name tag with a programmatic skip.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The changed file uses static Describe and It string literals; no pod, node, namespace, timestamp, UUID, IP, or generated value appears in either test title.
Microshift Test Compatibility ✅ Passed The changed test retains SkipOnMicroShift and [apigroup:config.openshift.io] plus [apigroup:machineconfiguration.openshift.io] guards; unavailable APIs are therefore protected.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The only Ginkgo test is protected by BeforeEach: exutil.IsSingleNode checks SingleReplicaTopologyMode and g.Skip runs before node and MCP operations.
Topology-Aware Scheduling Compatibility ✅ Passed The commit changes only one E2E test: it removes a test-name tag and adds an IsSingleNode skip; it adds no manifests, operator/controller code, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The change adds only IsSingleNode and g.Skip inside BeforeEach; the changed file has no fmt/print, os.Stdout, log, or klog stdout writes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only changes suite metadata and adds a single-node skip. It adds no IPv4 assumptions or connectivity; the existing registry.k8s.io pull remains under [Skipped:Disconnected].
No-Weak-Crypto ✅ Passed The PR changes only test metadata and single-node skip logic; the changed Go file adds no weak crypto, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed The only changed file is a Go test; added lines only change the test label and call IsSingleNode(). No privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root, or allowPrivilegeEscalation settin...
No-Sensitive-Data-In-Logs ✅ Passed The PR adds no logging calls or sensitive values; the only new diagnostic text is a generic single-node skip message, and existing logs are unchanged.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Aug 5, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@cpmeadors

Copy link
Copy Markdown
Contributor

/approve
/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 5, 2026
@saschagrunert

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@saschagrunert

Copy link
Copy Markdown
Member Author

/retest

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2026
@BhargaviGudi

Copy link
Copy Markdown
Contributor

/retest-required

@haircommander

Copy link
Copy Markdown
Member

@saschagrunert can you rebase?

…ame tag

Remove [Skipped:SingleReplicaTopology] from the Describe string and
use a programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for
deterministic sharding, which moved the test from shard 2of2 to 1of2
and reset all Sippy run counts to zero.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert
saschagrunert force-pushed the fix-additional-storage-shard branch from bec58d2 to a7a02f0 Compare August 10, 2026 17:56
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2026
@saschagrunert

Copy link
Copy Markdown
Member Author

@haircommander done. ✔️

@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2026
@haircommander

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2026
@openshift-ci

openshift-ci Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpmeadors, haircommander, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@openshift-trt

openshift-trt Bot commented Aug 10, 2026

Copy link
Copy Markdown

Job Failure Risk Analysis for sha: a7a02f0

Job Name Failure Risk
pull-ci-openshift-origin-main-e2e-vsphere-ovn-upi Low
[sig-cli] Workloads client test ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-Medium-71273-Medium-71275-Validate user is able to extract rhel8 and rhel9 oc from the ocp payload
This test has passed 0.00% of 1 runs on release 4.23 [Aggregation:none Architecture:amd64 CGroupMode:v2 ContainerRuntime:crun FeatureSet:default Installer:upi JobTier:standard LayeredProduct:none Network:ovn NetworkAccess:default NetworkStack:ipv4 OS:rhcos9 Owner:eng Platform:vsphere Procedure:none Scheduler:default SecurityMode:default Suite:unknown Topology:ha Upgrade:none] in the last week.
---
[Feature:NetworkSegmentation][ovn-kubernetes-ote][sig-network] Network Segmentation: services on a user defined primary network should be reachable through their cluster IP, node port and load balancer L2 primary UDN with custom network, cluster-networked pods, NodePort service [Suite:openshift/conformance/parallel]
This test has passed 0.00% of 1 runs on release 4.23 [Aggregation:none Architecture:amd64 CGroupMode:v2 ContainerRuntime:crun FeatureSet:default Installer:upi JobTier:standard LayeredProduct:none Network:ovn NetworkAccess:default NetworkStack:ipv4 OS:rhcos9 Owner:eng Platform:vsphere Procedure:none Scheduler:default SecurityMode:default Suite:unknown Topology:ha Upgrade:none] in the last week.

@BhargaviGudi

Copy link
Copy Markdown
Contributor

/test e2e-gcp-ovn

@BhargaviGudi

Copy link
Copy Markdown
Contributor

/verified by @BhargaviGudi a programmatic skip added via IsSingleNode() in BeforeEach

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@BhargaviGudi: This PR has been marked as verified by @BhargaviGudi a programmatic skip added via IsSingleNode() in BeforeEach``.

Details

In response to this:

/verified by @BhargaviGudi a programmatic skip added via IsSingleNode() in BeforeEach

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 29be8bd and 2 for PR HEAD a7a02f0 in total

@openshift-ci

openshift-ci Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

@saschagrunert: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 3d4c218 into openshift:main Aug 11, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants